Fix typo (s/expansive/expensive) (#389183)

2006-12-24  Bastien Nocera  <hadess@hadess.net>

	* gtk/gtkrecentmanager.c: Fix typo (s/expansive/expensive)
	(#389183)

diff --git a/ChangeLog b/ChangeLog
index 318562a895178cffb71c11adaa745fa853c2f7e8..0a0f26400ef52253474fa025c465f754cc4170fe 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-12-24  Bastien Nocera  <hadess@hadess.net>
+
+       * gtk/gtkrecentmanager.c: Fix typo (s/expansive/expensive)
+       (#389183)
+
 2006-12-24  Christian Persch  <chpe@cvs.gnome.org>
 
        * docs/reference/gtk/gtk-sections.txt:
@@ -75,6 +80,7 @@
        for replacing the selection via DND or copy-and-paste.
        (#64998, Damon Chaplin, Sven Herzberg)
 
+>>>>>>> 1.8517
 2006-12-23  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkimmulticontext.c: Be careful to not override

diff --git a/gtk/gtkrecentmanager.c b/gtk/gtkrecentmanager.c
index b991f7d6b0537cbcb60d97dd40802478fe60e2e4..8b31b13f88c91e7a438f1a1d0f616e1eace449e9 100644 (file)
--- a/gtk/gtkrecentmanager.c
+++ b/gtk/gtkrecentmanager.c
@@ -614,7 +614,7 @@ build_recent_items_list (GtkRecentManager *manager)
  * monitors the recently used resources list, and emits the "changed" signal
  * each time something inside the list changes.
  *
- * #GtkRecentManager objects are expansive: be sure to create them only when
+ * #GtkRecentManager objects are expensive: be sure to create them only when
  * needed. You should use the gtk_recent_manager_new_for_screen() or the
  * gtk_recent_manager_get_default() functions instead.
  *